Only use the portal color picker when appropriate
authorMatthias Clasen <mclasen@redhat.com>
Fri, 3 Aug 2018 00:54:21 +0000 (20:54 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 5 Aug 2018 01:47:35 +0000 (01:47 +0000)
This is just moving this check around.

gtk/gtkcolorpickerportal.c

index 429c414f4b29e40a56669d8d6f46ef031200368f..da567ae0b9e9150ee725d2348ed7c38caec1f8fa 100644 (file)
@@ -18,6 +18,7 @@
 #include "config.h"
 
 #include "gtkcolorpickerportalprivate.h"
+#include "gtkprivate.h"
 #include <gio/gio.h>
 
 struct _GtkColorPickerPortal
@@ -52,6 +53,9 @@ gtk_color_picker_portal_initable_init (GInitable     *initable,
   GVariant *ret;
   guint version;
 
+  if (!gtk_should_use_portal ())
+    return FALSE;
+
   picker->portal_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                                         G_DBUS_PROXY_FLAGS_NONE,
                                                         NULL,
@@ -63,7 +67,7 @@ gtk_color_picker_portal_initable_init (GInitable     *initable,
 
   if (picker->portal_proxy == NULL)
     {
-      g_debug ("Failed to create screnshot portal proxy");
+      g_debug ("Failed to create screenshot portal proxy");
       return FALSE;
     }